ViewControllers indexation Quirk Fix