Fixed missing AP issue