Changed to Java SE 1.6