Edit Event Fix