Imrpove Fixes #1410 => fail to compile with jdk7, fine with 6