some change to be compileable in Java 1.8