Changes madea s per bug 1399

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