Re #1114 JDK6 compatibility