Fixing Java 7 issue