Fix hash
Ensure proper type of lookup