#Issue 1643

#Issue 1393