Changed the hash behavior back

I felt that there was an issue with my previous changes, and likely thre should be some more care with casting and type consistency. As a result I've reverted my change in main.cpp back to its previous state, and left my addition commented out.