Resolve a race condition in Stasis