Fix AP change in construction