aofs-07 #165 (aofs-07)