Modify for use of JDK 11