Fix bad merge -- Following #7