removed extra checks as suggested by benhuson in issue #552 discussion