aofs-04 #226 (aofs-04)