More work for jdk1.5