Java 1.5 compatibility fix