Fixed not checking AP properly on actions