aofs-04 #235 (aofs-04)