Remove optgroup before bug gets fixed