fixed bug 6