I've confirmed that the attached branch also fixes the other bug, so I'll mark it a duplicate of this one.
I've confirmed that the attached branch also fixes the other bug, so I'll mark it a duplicate of this one.