aofs-09 #336 (aofs-09)