#Issue 0973