update to have better compatibility with 1.3 not done yet