fix comments. see #508