Fixed hash changing problem