maybe fixed hash issue?