Changing so we can use Java 1.6