#147 creating a wrapper class localizing the JDK6 fix to one spot