oops
Merge pull request #1311 from john-hill/fix-test

oops