fixing bugs again