slightly better condition check