previous grammar rule restored due to class support