Fix for super call