aofs-05 #234 (aofs-05)