Popover fix 2