aofs-05 #258 (aofs-05)