fixed more occurences with new hash style