Initial fixing for 1.7.2. Compiles but no function.