#Issue 0493