fix, returns a dict, not tuples