Add compatibility for base < 4.7