Cut more, but now it's not working...
Fixed with JDK 1.6
Merge branch 'orig'