fixed bug 5