aofs-04 #236 (aofs-04)