aofs-08 #332 (aofs-08)