Fix known bug in previous commit

(all to be squashed before hitting master)