Corrected advance behaviour