Another fix related to SVT changes