Bug fix: Implement Super call