Temporary fixes multiple popover bug