Performance bug fix w/ test
2 files changed