Fixed a problem with empty sets never returning