1.8.7 Hash fix to make tests pass