Fixed bugs created by fixing bugs