aofs-05 #226 (aofs-05)