angshu, hemanth | #1188 | bug fix