#74 Comments on top are moved to the wrong line