aofs-07 #311 (aofs-07)