Worked on bug 1999. fixed the build problem.