finally fix #109

previously, both Ben and Andrew had fixed it, and their fixes had
cancelled each other out