Fixing Todd's bug.