#Issue 1673

#Issue 0313