Fix the Gordon Town problem