aofs-07 #171 (aofs-07)