Fixed tau* issues