Fix hash key issue
merge