Fixes Bug_NoLock