Props to @bman4789 for this fix (sorry, no merge)