Correct issue on last phase