Fixed bug, but there are still more