Fix problem with java 1.5