Pull request for issue #303

Fixes #303. Generated by conveyor-workflow.