Fix for Bug #717