Improve the handling of iran