Issue 1054

Issue 1054