back to when and fixed deferred issues