Fix hash support