popup fix
migration to 3.5