fixed bug 3