Make it compatible with more 1.3 vesions