Applied the Java/Awesome fix again