Update for 5.8.4 asked in a loop