fixed Java 7 support