Fixed checks, they would pass incorrectly