#148 dropped signal flag, added another singleton instead