- Fixed bad if checks