some trouble fixed