Synchronous callback too early fix