aofs-04 #234 (aofs-04)