Issue 86: Compatibility with Java 6