#815 + 816 – there’s a third option, right?