Change it so it compatible with 1.7