Fix for jdk7