Pull request for issue #603

Fixes #603. Generated by conveyor-workflow.