fix events extend
hacky.