Fix on save handler not being invoked.