- fixed singletons