fix events again