aofs-09 #418 (aofs-09)