Trying to correct the flaw discovered by Ray Bellis.