Fixup for #239

Will not add extra text and it's all in #239.