pull request for issue #177