Fixed multiple return sets not being used.