Fix for Bug #3634