bug fix for 1654 #561

Closed rahulramakrishnan3 closed 1 month ago