aofs-04 #231 (aofs-04)