Up to 1.6 version