Fixed up broken event sourcing