fixed bug 8