#Issue 1543