Actually fixed everything

Finally