fixed bug 1