 			self.triggerDidMoveToParentViewControllerIfNeeded(toContentController, isReused: isReused)
 			// Remove the old content controller as the animation is completed
 			fromContentController.removeFromParentViewController()
+			// Set the content controller as the current one
+			self.currentContentController = toContentController
 			// Update the transition state flag
 			self.isPerformingTransition = false
 		}

	override public func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
		Log("Prepare for segue with identifier: \(segue.identifier)")
		if let _segueIdentifier = segue.identifier {
			// Store the content controller for later reuse and to keep track of the current content controller
			self.embedContentControllers[_segueIdentifier] = segue.destinationViewController
			// Check whether there is already a current content controler
			if let _currentContentController = self.currentContentController {
				// If there is a current content controller we can replace the content controller directly

			for (storedSegueIdentifier, storedContentController) in self.embedContentControllers {
				if (storedSegueIdentifier == segueIdentifier),
					let _currentContentController = self.currentContentController {
						self.replaceContentController(fromContentController: _currentContentController, toContentController: storedContentController, isReused: true)
						// Update the reuse state
						didReuseContentController = true
						// Update the current segue identifier
