Refix a bug I thought didn't exist any more