Closes issue #25

I would put this statement as a and clausule (note you should use ```&&``` instead of ```and```) on the above ```if``` so it gets more reliable.