Comments fixed #1574