aofs-08 #329 (aofs-08)