aofs-07 #234 (aofs-07)