Adapted to latest SSVSC