fix rehash & co