Hoping this fixes more than it breaks