remove weird condition