Fixed CaseDecorator