fixing optional group