BUGFIX: bad computation of p_data_action in BOTH models :-|