aofs-08 #382 (aofs-08)