Fix bug and derp