Changes to solve bug#1347

Signed-off-by: Arpit Goyal <agmps17@gmail.com>