Form flow correction