Bug fix for Victor.