Pull request for issue #438

Fixes #438. Generated by conveyor-workflow.