Fix AA issue