#Issue 1473