Remove super as it does not work consistently.