Make <5.5 compatible