fix deferred