Fixed the java 1.7 vs java 1.8 issue