Fix last problem with set resolution due to change in datastructure