aofs-08 #231 (aofs-08)