after thinking about this more shouldn't we just fix this in the event model ?