bug fix pull request #32