aofs-07 #258 (aofs-07)