restored compatibility with Java 6