Sharvani |#2216 | Fixing bug.