Remove the bug about field shift when AP name field is lost