Adapted to newest ssvjc