re #579: removed extra comments and added another conditional