aofs-05 #236 (aofs-05)