Fixed what I hope was the last bug