fixed bug 2394