Back to compatibility with JDK6