|#833|+Balvinder| Fixing bug.