Make it compatible with versions greater than 4.0.0