Fix for lock