Fix Joe problem.