(small) Follow up to #839

Follow up from #839