make work with current ea jdk
fix mergery