fix Bug #2031