Fix bad merge, pt 2