fix deferred call errors