Fixed event result bugs