Fix AP event
Remove useless scope