:bug: Fix on save event handling