#Issue 1313

#Issue 1303