fixed popover bugs