Fix loading of singletons