Fix for Bug 775 1 commit