Fixing Shellshock