Singleton raises TypeError on #new
Merge pull request #1281 from Bovi-Li/singleton

Singleton raises TypeError on #new