Fixed 5.8 incompat.