Hopefully fix all this stuff