Fixed Java 8 Issue

Fixed Java 8 Issue