More comments to clarify #495