#68 fixed for Java 1.6