Bug#84 fix updation