Making it also work with base < 4.7