Fix bug introduced by Burt's cleanup pull request