Fix Before it breaks