Fixed Singleton stupidity.