Fix js eventing