fixed a bug, still not working