Fixed bugs again