Fixed a key issue