Should fix non-hashable error