Make compatible with 5.9 too