Sharvani | #2187 | Fixing bug.