#Issue 1293