bug fix 1361, 1393,1508 #523

Closed rahulramakrishnan3 closed 3 months ago