r1348 + removed debug lines