Fix bugs again :(