fixed regressions in manipulation due to the use of inheritance.