Fixing the DDPStateSingleton class