Fix Deferred checking