Updated to conform to JRE 1.6