Correcting to account for jgarzik's feedback