Fix for proguard on  Java8