fixed key issue