BalajiN | #49 | Fixing bug