Fixed AMBuilder