[MERGE] fix of previous merge about analytic on taxes. Courtesy of Alexis de Lattre...