have to make a quick fix for non-unique names