Adapted to latest SSES/SSVMS