Integrating popup fix.