Fixed singleton issue