#Issue 0473