#156 Forgot to modify keyboard also..