fixed bug 1122