aofs-07 #267 (aofs-07)