Fix for jdk1.6