@GlobalDomestic I did say on your other PR that the changes I've commented on shouldn't be included here, but since this one fixes a legitimate bug it's going to be changed in a separate commit specifically relating to that bug.