aofs-09 #234 (aofs-09)