fixed Singleton imports