Issue #48: Fixing the hash generation class