Fixed bugs, again..