Fixed bug with unused keys