Finally fixed derp?