Whoops, some logic got lost in the last change.