singletons fixed(?)