Issue751

See issue #751 for explanations about this PR