Fix for empty uniques