[Issue #831] Fix for OperationJoin race condition