Got rid of a race condition caused by the EventAggregator