fixing phantom singletons