change way hashes are used, should help with #55