aofs-07 #172 (aofs-07)