Fixed the navigation and returned valid NSArray