aofs-07 #305 (aofs-07)