aofs-09 #399 (aofs-09)