Fixed Bug #690