trying to fix LOCK issues...