fix crash + add / delete issue events