Pull request for issue #664

Fixes #664. Generated by conveyor-workflow.