Hopefully this fixes everything