Pull request for issue #638

Fixes #638. Generated by conveyor-workflow.