hey @mdwala, What version of ERPNext are you on? The version 10 (Released 6 days ago) has a fix for this. (Again, You guys are awesome - Team ERPNext).
Please, update to version 10 and have fun using ERPNext… BTW Happy New Year!!!