Working on second order popup bug