Singleton in correct place