aofs-12 #233 (aofs-12)