Fix: This commit re-enables compilation with Java 6