bugfix popover handling