aofs-05 #230 (aofs-05)