Merged Klaus's echo fix. Apperently the compiler didn't manage to remove all the dead code.