Made compatible with Java 1.6 (included on testing live DVD)