- Fixed an issue with keys