Fixed emitter bug + findElement bug