aofs-12 #238 (aofs-12)