Update to work with hashable-1.2