Temporary fix for VE-688