Another attempt to fix hashes for 1.8.7 compatibility