Fixing issue with reconstructing locked lock