another patch for reducing emperor race conditions