fix Olaf's comments.