Re #675 support for JDK6