Fix for delete events public bugs