KeyEmitter fixed (issue #10)