Setting popover bug fix