Solve issues related to singletons