Work with v24.3 as well as v24.4