Fixed singleton issue.