Fix key issue