aofs-09 #337 (aofs-09)