fixed bug 1082