made compiles with singletons-1.0 somehow (fixes #1)