Fixed conflicts between prevaluation and pre_valuation