Changed the behavior of key shifting