Pull request for issue #322

Fixes #322. Generated by conveyor-workflow.