fix handling for #once events