Try to fix miss call of the save function