fix singleton error introduced in 82c16aab5c61510f46eed80fc79110f071ad9e35