Manually applying Gunnars patch because it's easier this way - and a good chance...