Still getting sporadic locking problems. Small consistency enhancement,
should solve is, but is not wrong.