aofs-05 #231 (aofs-05)