Fixed singleton error