Fix event unmarshalling