Bugfix incorrect class in super call