Fixed Joe's merge conflict