Fix for Bug 496.