Spoke too soon, one bug was left.