Fixed through section 2.1