Fix for Bug#4275.