Patch for compilation under 1.5 JDK