Made popovers a bit more stable