Fixed scanner to recognize idents right