Fix the Tony Smith problem.