#Issue 0313