hash mapping fix