singleton was global, fix