Adapt to 4.3.3