Fixes singletons lifecycle conflict