fixed bug 811