Fix for build failure. Issue with jdk 1.6