Pull request for issue #197