bug fix 1585 #536

Closed rahulramakrishnan3 closed 3 months ago