#Issue 1573