Fix bug introduced in pull request #3