Adapt to 4.2.4