Fixes #1168 - comments now load