Solved one bug, I believe