Keyguard fix