Fixed Keyboard issue (Needs testing)