bugfix - keys