Fixed crash for saf2