aofs-09 #417 (aofs-09)