Fix: Reset super on kill