Fix for Bug#3757