mher: Change to locking.