aofs-09 #489 (aofs-09)