removing comments resolves #495