aofs-05 #235 (aofs-05)