Fix for Buid failed on JDK8 #1