Fix for HashMap out of order bug raised by Rohan Mathure

Fix re: Vivo-dev-all email thread relating to this bug