Popover fix: typecheck more specific