fixed for jdk 1.6