issue #126 make Java 6 compatible again