Fixed java7 build