Potential fix for 2968.