aofs-07 #334 (aofs-07)