aofs-07 #438 (aofs-07)