Fix an issue with popup definition coming after vector calls