aofs-07 #168 (aofs-07)