get rid of weird double-singleton anti-pattern