Issue #367 Constants replaced by Tv.