Fixing Gilles' mess