Issue 92: Maintain Java 1.6 compatibility