Fix for hash collisions