Again, changes locking behavior @jmlvanre