fixed a bug but still has some