Fix to follow Catalyst-5.89000