Fixing a severe event leak, breaking change :(