pull request for ticket #6