I think I fixed bug 6