Magical fixes hurray!