fix events manager