Fix for Bug#3182.