To address similar issues for #37
To address similar issues for #37