Fix OPAL-1715: Derived variable cannot be removed