Fix issue with Hash key