aofs-06 #231 (aofs-06)