aofs-07 #271 (aofs-07)