try to fix bug on save