Fix null event