Fix hashe handling