fixed bug 941