#Issue 1493