Fix issue EVENT-20