minor improvement. Add support for older JVMs