Fixed #243. Seriously. 90+ tests & this one keeps slipping by