Pull request for issue #856

This is a pull request to solve issue #856.