Modify emit call