Override popup fix