Fixed up the issue with singular user problem.