Java 1.7 bugfix