Fixed bugs, again