The supply is 21 million. Issuance increases the circulating supply and moves it toward the total supply. Satoshi was not wrong, he was imprecise.