Solved synchronicity issue in Event Factory