MCF updated to fix Keypad crash