Final derp fix