Fix for #api events