#Issue 1373