FIX problem with singletons