Adapted to lastest SSVSC