aofs-07 #231 (aofs-07)