fixed issue with J5 don't save when click yes