aofs-08 #228 (aofs-08)