* Changed implementation for Java 7 compatibility