Adaption for multi-version compability (4.7 - 4.9)