#Issue 1303