Fixed bug introduced in pull request #82