fix for some cases that hadn't come up before