Fixed event more formatting