Fixed Bug #3213