aofs-07 #162 (aofs-07)