aofs-07 #257 (aofs-07)