changed esaf issue