Attempted fix for keyhunt