Fix emitting of alterted events