Fix for invalid locking approach