Finally fixed the hash madness