Compatibility with JDK 1.6 fixed.