fixed bug 1114