Fixed unexpected singleton require behavior