Support carto 0.9.4 -- based on @Mr0grog's path