Fixed to compile classes for Java 6 and version 2.4.1