angshu | #1546 | bug fix