Better check conditions