Fixed one bug, one more to go