More aggressive accidental lock pretection