Forgot to fix a bug from the major edit.