fixes for @shiftkey