fixed bug 2