fix broken event emitters