Should've fixed compilation issues for Java 1.7