fix singleton
Merge pull request #26 from Ceasar/singleton_fix

fix singleton