Fix to popover code.