Fix for java7