bugfix for extra keys