improved jdk-1.6 compatibility