fixed one bug, but not working...