Fix hash key issue