Fixes: #2432 locking conflict errors