Derp fix part 2