Fix SAO parsing