Switched to manual key check