Fix modifier keys, again