fixed compatibility with 1.8 ver