yeah, took a while to actually find the time to (1) track down the root issue and (2) actually fix it