Fixing Tam\'s changes