Issue 1050

Issue 1050