Fixed a bug related to key