Fixed event editing