Pull request for issue #648

Fixes #648. Generated by conveyor-workflow.