deferred handling fix