aofs-08 #381 (aofs-08)