aofs-07 #224 (aofs-07)