Fixing event popup