#Issue 1673