Fix for empty sets