Restored Java 6 compatibility