Fixed the loading from singletons bug