Fixed popover bug