Pushing to fix one of Conner's issues