Fixing Trivocs mistakes... again.