Fix problem with failing popovers