#Issue 0583

#Issue 0543