fix maybe deferred calls