updated to build with java 1.6