fixed bug 791