fix AA issues