Correcting event store dependency.