fixed hash matching issues