Issue 1051

Issue 1051