Updated for Travis issue with JDK