Fixed popover issues :/