Upgrade to java 7