Issue 1052

Issue 1052