fix compilation with latest x3-scalability branch