#Issue 1223