Fix for rehash