[FIX]: One more fix, if we are not using the navigation controller, we switch it back ourselves!