#Issue 1353