Fix JDK9 pattern handling