Potential fix for Connor