Added support for jdk6 (fixed!)