Fixed compatibility with Java 1.6