aofs-05 #233 (aofs-05)