aofs-07 #333 (aofs-07)