Fix popup plugin