Better handling of the current action state