aofs-07 #242 (aofs-07)