Thank You Oliver

Also, thanks for the link to that github ticket, that was actually another issue that we had flagged to look into.