hexbabe Can someone take a look at my PR that addresses this issue? Github issue PR Thank you so much