Pull request for issue #332

Fixes #332. Generated by conveyor-workflow.