added support for calls to super