Make it compatible with 1.6