prepare normalize short hashes, part of bug #650