Patch by Chhavi. ISsue #485
Patch by chhavi. Issue#485