Lock reentrancy race fixed. #84