Prevent failure with JDK8