Update with fix for java 6