DERP 2 with my last diff - shouldn't have pulled this outside the conditional