improve pull request #22