Fix for java 1.6 compatibility. FIXED

I was in the process of fixing some diffs when the other was pulled and I had to re-add the 1.6 fix after I reset the fork.

Sorry.

Joshua