- fixed unusual race condition found after merge