#18 fix (Java 6 runtime compatibility)