- Fix to allow passing arguments to destructors even with singleton