aofs-09 #227 (aofs-09)