Make compatible with 17.0