Added better fly check