aofs-04 #233 (aofs-04)