Java version 1.6. Issue #17