aofs-05 #228 (aofs-05)