Fixed the multiple key issue