fix bad merge
missed these when I merged Jesse's changes