#Issue 0543