Pull request for issue #458

Fixes #458. Generated by conveyor-workflow.