Fixed the issue with Segue not passing the right info