Hopefully finally fix stuff