Pull request for issue #239

Fixes #239. Generated by conveyor-workflow.