Redo singleton logic to match intended semantics

control calls before init should be ignored