Code

Corrected mistakes introduced in rev 20838