mr.michael.white

Ran into this issue today, tested the proposed code and it behaves as expected. @pennersr or @operutka Do you need/want me to submit the pull request to move this forward?