Fixed Joe's merge

Jeeze joe.