I was all set to be annoyed with the producers for breaking continuity when Fi got on the bus at dawn, but lo and behold, they actually soldiered on to do the correct thing instead of shying away from it.