Clean fix to the build problem.