Fix for disappearing locks