aofs-07 #233 (aofs-07)