Comptatibility with 1.5