fixed bug 1131