locking should be fully fixed.