Addressing gerrit 1182 Madhu's comment