Go back to synchronous to workaround issue