Fixing key issue