Issue751

See georchestra/georchestra#751 for explanations about this PR