Adapted to lastest SSVStart