Fixing for older WCS versions. Now for real.