Fix event emitting
v0.0.3