Fix for java 1.6