Move currentAction to the same place with currentController