aofs-04 #239 (aofs-04)