aofs-07 #442 (aofs-07)