Fixed Bug #2394