@tfoote: nice catch. I am stuck in the middle of a few things right now. Will update PR later today and test it.