#Issue 1073