aofs-07 #262 (aofs-07)