Small fix to this. Will resubmit a squashed PR.