#Issue 0993